Replace deprecated assembly op code. am: ffb56c065b Change-Id: I691aee1a1c868291aa7e1eee2787f300f451f2f8